bitkeeper revision 1.1236.1.102 (423f0cf0IKBttbyFsA4dM4ZHz13vAQ)
authorkaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk>
Mon, 21 Mar 2005 18:05:36 +0000 (18:05 +0000)
committerkaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk>
Mon, 21 Mar 2005 18:05:36 +0000 (18:05 +0000)
Merge firebug.cl.cam.ac.uk:/local/scratch/kaf24/xen-2.0-testing.bk
into firebug.cl.cam.ac.uk:/local/scratch/kaf24/xen-unstable.bk


Trivial merge